From 9a690cd4f932c275422b3c5c1e150551a7a638fb Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Sat, 12 Jan 2019 16:16:52 +0100 Subject: [PATCH] Correct charls-2.0 patch --- debian/patches/09_charls-2.0.patch | 55 ++++++------------------------ 1 file changed, 11 insertions(+), 44 deletions(-) diff --git a/debian/patches/09_charls-2.0.patch b/debian/patches/09_charls-2.0.patch index 52fb8971..cd49822c 100644 --- a/debian/patches/09_charls-2.0.patch +++ b/debian/patches/09_charls-2.0.patch @@ -1,44 +1,11 @@ -Author: Gert Wollny -Description: Fix build with CharLs 2.0 - -diff -ru dcmtk-3.6.4/dcmjpls/apps/CMakeLists.txt dcmtk-3.6.4.new/dcmjpls/apps/CMakeLists.txt ---- dcmtk-3.6.4/dcmjpls/apps/CMakeLists.txt 2018-11-29 13:14:03.000000000 +0100 -+++ dcmtk-3.6.4.new/dcmjpls/apps/CMakeLists.txt 2019-01-11 19:27:04.000000000 +0100 -@@ -8,5 +8,5 @@ - - # make sure executables are linked to the corresponding libraries - foreach(PROGRAM dcmcjpls dcmdjpls dcml2pnm) -- DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls charls dcmimage dcmimgle dcmdata oflog ofstd ofstd) -+ DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls CharLS dcmimage dcmimgle dcmdata oflog ofstd ofstd) - endforeach() -diff -ru dcmtk-3.6.4/dcmjpls/CMakeLists.txt dcmtk-3.6.4.new/dcmjpls/CMakeLists.txt ---- dcmtk-3.6.4/dcmjpls/CMakeLists.txt 2018-11-29 13:14:03.000000000 +0100 -+++ dcmtk-3.6.4.new/dcmjpls/CMakeLists.txt 2019-01-11 19:27:04.000000000 +0100 -@@ -2,6 +2,6 @@ - project(dcmjpls) - - # recurse into subdirectories --foreach(SUBDIR libsrc libcharls apps include) -+foreach(SUBDIR libsrc apps include) - add_subdirectory(${SUBDIR}) - endforeach() -diff -ru dcmtk-3.6.4/dcmjpls/libsrc/CMakeLists.txt dcmtk-3.6.4.new/dcmjpls/libsrc/CMakeLists.txt ---- dcmtk-3.6.4/dcmjpls/libsrc/CMakeLists.txt 2018-11-29 13:14:03.000000000 +0100 -+++ dcmtk-3.6.4.new/dcmjpls/libsrc/CMakeLists.txt 2019-01-11 19:27:04.000000000 +0100 -@@ -4,4 +4,4 @@ - # create library from source files - DCMTK_ADD_LIBRARY(dcmjpls djcparam djdecode djencode djrparam djcodecd djutils djcodece) - --DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage charls) -+DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage CharLS) -diff -ru dcmtk-3.6.4/dcmjpls/libsrc/djcodecd.cc dcmtk-3.6.4.new/dcmjpls/libsrc/djcodecd.cc ---- dcmtk-3.6.4/dcmjpls/libsrc/djcodecd.cc 2018-11-29 13:14:03.000000000 +0100 +diff -ru dcmtk/dcmjpls/libsrc/djcodecd.cc dcmtk-3.6.4.new/dcmjpls/libsrc/djcodecd.cc +--- dcmtk/dcmjpls/libsrc/djcodecd.cc 2019-01-12 16:13:14.012002607 +0100 +++ dcmtk-3.6.4.new/dcmjpls/libsrc/djcodecd.cc 2019-01-12 15:48:40.936001789 +0100 @@ -37,7 +37,7 @@ #include "djerror.h" /* for private class DJLSError */ // JPEG-LS library (CharLS) includes --#include "intrface.h" +-#include "CharLS/interface.h" +#include "CharLS/charls.h" E_TransferSyntax DJLSLosslessDecoder::supportedTransferSyntax() const @@ -91,14 +58,14 @@ diff -ru dcmtk-3.6.4/dcmjpls/libsrc/djcodecd.cc dcmtk-3.6.4.new/dcmjpls/libsrc/d { // The dataset says this should be planarConfiguration == 0, but // it isn't -> convert it. -diff -ru dcmtk-3.6.4/dcmjpls/libsrc/djcodece.cc dcmtk-3.6.4.new/dcmjpls/libsrc/djcodece.cc ---- dcmtk-3.6.4/dcmjpls/libsrc/djcodece.cc 2018-11-29 13:14:03.000000000 +0100 +diff -ru dcmtk/dcmjpls/libsrc/djcodece.cc dcmtk-3.6.4.new/dcmjpls/libsrc/djcodece.cc +--- dcmtk/dcmjpls/libsrc/djcodece.cc 2019-01-12 16:13:14.012002607 +0100 +++ dcmtk-3.6.4.new/dcmjpls/libsrc/djcodece.cc 2019-01-12 16:04:27.288002315 +0100 @@ -55,7 +55,7 @@ #include "dcmtk/dcmimgle/dcmimage.h" /* for class DicomImage */ // JPEG-LS library (CharLS) includes --#include "intrface.h" +-#include "CharLS/interface.h" +#include "CharLS/charls.h" BEGIN_EXTERN_C @@ -211,7 +178,7 @@ diff -ru dcmtk-3.6.4/dcmjpls/libsrc/djcodece.cc dcmtk-3.6.4.new/dcmjpls/libsrc/d size_t bytesWritten = 0; -- JLS_ERROR err = JpegLsEncode(&buffer, &size, &bytesWritten, framePointer, frameSize, &jls_params); +- JLS_ERROR err = JpegLsEncode(&buffer, size, &bytesWritten, framePointer, frameSize, &jls_params); + auto err = JpegLsEncode(&buffer, size, &bytesWritten, framePointer, frameSize, &jls_params, NULL); result = DJLSError::convert(err); @@ -296,19 +263,19 @@ diff -ru dcmtk-3.6.4/dcmjpls/libsrc/djcodece.cc dcmtk-3.6.4.new/dcmjpls/libsrc/d size_t bytesWritten = 0; -- JLS_ERROR err = JpegLsEncode(&compressed_buffer, &compressed_buffer_size, &bytesWritten, framePointer, buffer_size, &jls_params); +- JLS_ERROR err = JpegLsEncode(&compressed_buffer, compressed_buffer_size, &bytesWritten, framePointer, buffer_size, &jls_params); + auto err = JpegLsEncode(&compressed_buffer, compressed_buffer_size, &bytesWritten, framePointer, buffer_size, &jls_params, NULL); result = DJLSError::convert(err); if (result.good()) -diff -ru dcmtk-3.6.4/dcmjpls/libsrc/djerror.h dcmtk-3.6.4.new/dcmjpls/libsrc/djerror.h ---- dcmtk-3.6.4/dcmjpls/libsrc/djerror.h 2018-11-29 13:14:03.000000000 +0100 +diff -ru dcmtk/dcmjpls/libsrc/djerror.h dcmtk-3.6.4.new/dcmjpls/libsrc/djerror.h +--- dcmtk/dcmjpls/libsrc/djerror.h 2019-01-12 16:13:14.012002607 +0100 +++ dcmtk-3.6.4.new/dcmjpls/libsrc/djerror.h 2019-01-12 15:46:22.784001713 +0100 @@ -24,7 +24,7 @@ #include "dcmtk/config/osconfig.h" #include "dcmtk/dcmjpls/djlsutil.h" /* For the OFCondition codes */ --#include "intrface.h" /* CharLS include */ +-#include "CharLS/interface.h" /* CharLS include */ +#include "CharLS/charls.h" /* CharLS include */ /** Helper class for converting between dcmjpls and CharLS error codes -- 2.30.2